]> dgit.raspbian.org Git - linux-4.9.git/commitdiff
Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
authorpopcornmix <popcornmix@gmail.com>
Sat, 22 Apr 2017 17:14:29 +0000 (18:14 +0100)
committerpopcornmix <popcornmix@gmail.com>
Sat, 22 Apr 2017 17:14:29 +0000 (18:14 +0100)
1  2 
drivers/char/Kconfig
kernel/cgroup.c

Simple merge
diff --cc kernel/cgroup.c
Simple merge